From: Florian Müllner <fmuellner@gnome.org>
Date: Sun, 15 Oct 2017 22:09:52 +0000 (+0200)
Subject: popupMenu: Fix setting ImageMenuItem's icons via strings
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~994^2^2~170
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c12da66da8b82f762c47109735391488ca2cfee9;p=gnome-shell.git

popupMenu: Fix setting ImageMenuItem's icons via strings

Commit 28ca96064bcb added support for setting PopupImageMenuItem's icons
via GIcons as well as via strings. However as the check whether an object
implements the GIcon interface only works on GObjects, specifying an icon
name was broken. Fix that to actually allow both strings and GIcons.

https://bugzilla.gnome.org/show_bug.cgi?id=789018
---

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index d00132ff9..cb975f5f5 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -405,7 +405,7 @@ var PopupImageMenuItem = new Lang.Class({
 
     setIcon: function(icon) {
         // The 'icon' parameter can be either a Gio.Icon or a string.
-        if (GObject.type_is_a(icon, Gio.Icon))
+        if (icon instanceof GObject.Object && GObject.type_is_a(icon, Gio.Icon))
             this._icon.gicon = icon;
         else
             this._icon.icon_name = icon;